-
Notifications
You must be signed in to change notification settings - Fork 353
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix for failing nightly iOS end to end tests #6120
Conversation
00dfcba
to
1a82fa8
Compare
ca84ab2
to
58f0140
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 4 of 6 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @niklasberglund)
ios/MullvadVPNUITests/AccountTests.swift
line 61 at r2 (raw file):
LoginPage(app) .tapAccountNumberTextField() .enterText(self.hasTimeAccountNumber)
Nit: Unnecessary self
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 4 of 6 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @niklasberglund)
ios/MullvadVPNUITests/RelayTests.swift
line 54 at r2 (raw file):
.tapDNSSettingsCell() DNSSettingsPage(self.app)
If any of the steps that happens before we enable DNS ad block fails, this will put it in the wrong state for the entirety of the run.
We should be able to guarantee that it's not toggled, but set to the off state here.
I haven't tested that, but something along those lines should be good I think
@discardableResult func toggleOffBlockAdsSwitch() -> Self {
let blockAdsSwitch = app.cells[AccessibilityIdentifier.blockAdvertising]
.switches[AccessibilityIdentifier.customSwitch]
guard blockAdsSwitch.value as? String == "0" else { return self }
blockAdsSwitch.tap()
return self
}
5c98b9f
to
002a255
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 4 of 7 files reviewed, 2 unresolved discussions (waiting on @buggmagnet and @rablador)
ios/MullvadVPNUITests/RelayTests.swift
line 54 at r2 (raw file):
Previously, buggmagnet wrote…
If any of the steps that happens before we enable DNS ad block fails, this will put it in the wrong state for the entirety of the run.
We should be able to guarantee that it's not toggled, but set to the off state here.I haven't tested that, but something along those lines should be good I think
@discardableResult func toggleOffBlockAdsSwitch() -> Self { let blockAdsSwitch = app.cells[AccessibilityIdentifier.blockAdvertising] .switches[AccessibilityIdentifier.customSwitch] guard blockAdsSwitch.value as? String == "0" else { return self } blockAdsSwitch.tap() return self }
Have implemented a check and tapping only when the toggle is on in teardown
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 3 of 3 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @niklasberglund)
002a255
to
3f22b8d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r4, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @niklasberglund)
Fixes for
testLogin
andtestCustomDNS
end to end tests failing. This PR removes the "no time account number" which is a persistent account without any time on it, and adds teardown blocks fortestAdBlockingViaDNS
andtestAdBlockingViaDNS
reset state changes that affected other tests.To test the changes in this PR its easiest to run the GitHub actions workflow
iOS end-to-end tests
. I did a run on this branch at https://github.com/mullvad/mullvadvpn-app/actions/runs/8690296877This change is